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

Change-Id: I21fa0deb6491970e798cfb9317b7794fb1580791