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

Change-Id: I1e38b1030b486c1f8f641415d343bddb560d746d