Merge "Fix invalidate rotation value which causes CTS failures" into tm-qpr-dev