Merge "Watch for external Secure.DATA_ROAMING changes."