Merge "Update back arrow for settings"