Merge "Moving keyguard indicator text lower in split shade" into sc-v2-dev