Merge "AOD: Fix shelf animating when it should not" into oc-dr1-dev