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