Merge "Fix background bypass via notifications" into qt-dev