Merge "Fixed a bug where shelf notifications were interactable" into oc-dr1-dev