Merge "Merge "Prevent orientation request loop in override" into tm-qpr-dev am: 84903feb am: 28d7f6a5" into udc-dev