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

Change-Id: Ib51c0125042553302584c79a360ee07f2ae1c1b8