Merge "Cleaning up mRestoredSelection after restoring selection." into arc-apps