Merge "Consider requested orientation for snapshot compatible" into tm-dev