Merge "Fix SettingsHomepageActivity crash during configuration change" into tm-qpr-dev