Merge "KeyguardIndication text updates" into sc-dev