Merge "DO NOT MERGE: Only restore the positions of types which are controlled" into rvc-qpr-dev