Merge "Do not unregister keyguardupdatemonitor" into udc-qpr-dev