Merge "Don't set timeout when showing CDM UI" into rvc-qpr-dev