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

Change-Id: I307a3d65603f5ede0e283f36715271bc68b8eabd