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

Change-Id: Ib27b4d5f6252fc5349e391dbb375834d0e42b80b