Merge "Revert "Enable background restrictions""