Merge "Merge "QS: Fix RTL animation" into nyc-dev am: d1df86dbb8 am: 5a2b96a8c5" into nyc-mr1-dev-plus-aosp