Merge "Remove the "airplane-safe" string from SysUI" into sc-dev