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