Merge "Fixed a bug where shelf notifications were interactable" into oc-dr1-dev am: 91a6a101 am: 8468fdd4 am: b2eb34c3 Change-Id: I6bd7a72d5e6b9113214349e21f95407374a7021d