Merge "Update bug number on TODO for activity launch on occluded keyguard" into udc-qpr-dev