Merge "Remove caption when keyguard is visible" into udc-qpr-dev