Merge "DO NOT MERGE Remove superfluous resetting of Keyguard on unocclusion." into rvc-qpr-dev