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

Change-Id: I7d7434afd13d4f6d6247c801dfa0551ef1b6b792