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

Change-Id: I27b759a6fe843b84c402a9fc72ff6d53ab5797c6