Merge "Temporary fix for background invalidation"