Merge "allow KeyguardIndicationController to be more easily overriden" into rvc-qpr-dev