Merge "Fix issue where menu items visible on 'closed' notification on lockscreen" into oc-dev am: 4b7b01c1cc
am: daf76b82ae

Change-Id: Ia7b9f62d9040a98193e0ed79a259e0741538f494