Merge "Reduce ACCOUNTS_CHANGED broadcast usage." into main