am 41ccfff3: Merge "Updating launcher layouts (Bug 6955380)" into jb-mr1-dev

* commit '41ccfff36a9d4f5a52aaef3acbe295fdfd2d0e37':
  Updating launcher layouts (Bug 6955380)