Merge "Don't unregister doze sensors that have been requested" into sc-qpr1-dev