Merge "[conflict] Merge "Skip Size Compat mode when orientation change comes from app" into tm-qpr-dev am: 11231f40 am: 19ab48cf" into udc-dev