Merge "Add Tapjacking Protection for SettingsHomepageActivity" into qt-qpr1-dev am: 12510978c3

Change-Id: I0808583341d6f2a867dfa47cf08e7f529e3b0571