Merge \"QS: Fix crash when removing pages in RTL\" into nyc-dev
am: 9b5a780722

Change-Id: I81df6680e203af32d5cead8ab9340aff2a6fcaba