Merge "ChangeScreen2: Include space before 'in Settings' in welcome bar" into stable-2.9