Merge "Fix issue #5173952: Opening a Notification From Lock Screen..."