Merge "Decreases likelihood of AoD flickering" into oc-mr1-dev