Merge "Defer ending launcher power mode hint until after transient transition" into udc-dev