Merge "Make Settings shortcuts launch into the correct activity/fragment." into jb-mr1-dev