Merge "Fix black frame when unlocking device via clicking on notification"...
Merge "Fix black frame when unlocking device via clicking on notification" into nyc-dev am: 19743818
am: 07a8091a
* commit '07a8091a':
Fix black frame when unlocking device via clicking on notification