Merge "Move status view to keyguard root view" into udc-qpr-dev