Settings: Improve location modes summary

Change-Id: Idc94015aac1944f4ab1cdf3541cd49d8b00babb2
Settings: Indicate that 'Baton' should not be translated

Change-Id: I64f77839f47192275d32e7766a9c32868ddcebab
Fix task behavior for ThemeChooser [3/3]

Change-Id: I3608d06521b650d40df1d32f6d2cce1376830a58
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0