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

Change-Id: I714c9dd4feec926ac6def208dc8e7382b9f87992