Merge "Fixed a bug where shelf notifications were interactable" into oc-dr1-dev
am: 91a6a10195

Change-Id: I22d04dfa022e8547b261b6168b75265fdfcf0dca