Merge "Set rotation layers as opaque initially" into tm-qpr-dev