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

* commit '2e68c9b614a2cca37ecbbc1aaf2c1427f2886abf':
  Updating launcher layouts (Bug 6955380)