Merge "Updating launcher layouts (Bug 6955380)" into jb-mr1-dev