Merge commit '25c52b70faceb24cade0f5480c372de3f47bdf79' * commit '25c52b70faceb24cade0f5480c372de3f47bdf79': Separate the Settings activity name into two different strings.
Merge commit '25c52b70faceb24cade0f5480c372de3f47bdf79' * commit '25c52b70faceb24cade0f5480c372de3f47bdf79': Separate the Settings activity name into two different strings.