Merge "Prevent orientation request loop in override" into tm-qpr-dev