Merge "Enforce "auto-sync app data" setting for POP3/IMAP"