Merge "Settings Hooks launch wrong activity"