Merge "Keyguard customization for mcc262-mnc07" into klp-dev