Merge "Fix upper back button behavior of LocationSettingsActivity"