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

Change-Id: I82a946320bef6dae9d9131a7666c138f82b32a86