Merge "Sync foreground/background and restricted permission app op together."