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