Merge "Revert "Intent API for background restriction settings"" into main