Merge \"QS: Layout and animation refinement\" into nyc-mr1-dev
am: 536a1a2ae7

Change-Id: Ia67c579dddabdf07c890edb157e81cafae3f5ded