Merge "Allow AllApps to restore current selected tab on activity recreate" into sc-dev