Merge "Test for hidden keyguard before waiting for it." into klp-dev