Merge "QS: Layout and animation refinement" into nyc-mr1-dev