Merge "Pose flicker fix on some devices" into oc-dev