Merge "Fixed an issue where the shade would jump" into oc-dev am: 1e2340da3a
am: 84912122ce  -s ours

Change-Id: I76cfa4d88bbcd2bf5b95a7e79f59ae0638ebe132