Merge "Fixed an issue where the notification could stay userlocked" into oc-dev am: dc66506f0a
am: 81c8d5f861

Change-Id: I4cf8932e64329727d23da074d2ba7af08718676f