Merge "Fixed an issue where a notification could stay userlocked" into oc-dr1-dev
am: 7b04275a68

Change-Id: I0f67b6aeb6b770df12679fc333f506b67e79b5f3