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

Change-Id: I8afe831ef47d877b57535919cbd135eee9b5a93a