Merge "Settings Hooks launch wrong activity" am: 69704608f4
am: 6cbc7e4f85 -s ours
* commit '6cbc7e4f85a17c49d787025fbd73c7ebe3b0385b':
Settings Hooks launch wrong activity
This commit is contained in: