Merge "Use legacy layer name for screenshot shell display rotation" into tm-qpr-dev