Merge "Wait for keyguard draw before stopping boot animation" into oc-dev