Merge "Fix black frame when unlocking device via clicking on notification" into nyc-dev