Merge "Wait for unknown vis to resolve before forcing keyguard orientation" into pi-dev