Merge "Fix issue #35309312: Background start not allowed: service..."