Merge "Notification: Remove actions from public view" into oc-dev am: 37963d61b2
am: b26c94ce4b

Change-Id: I1801ecae3fb327c8767f71d5e7f91c5cd581c448