Merge "Pose flicker fix on some devices" into oc-dev am: 5da2188e4c
am: 1c8b3073f6

Change-Id: Ice8603e580a34d3d99ee404c9aabbe2fb1ad0960