Merge "Merge "Fixed a bug where shelf notifications were interactable" into oc-dr1-dev am: 91a6a101 am: b3d487da" into oc-mr1-dev-plus-aosp