Merge "Fixed an issue where the shelf could be hidden" into oc-dr1-dev
am: fdc84a13a2

Change-Id: I6c90944ad0db3d309210f1df1d0a1c33bc13cc71