Merge "Add Tapjacking Protection for SettingsHomepageActivity" into qt-qpr1-dev