Merge "[DO NOT MERGE] Remove UNOCCLUSION_TRANSITION flag" into tm-qpr-dev