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

Change-Id: I2956ecaff7b471af05e9baa275d7ea0742bfb4eb