Merge "Remove spinner in Settings > VPN" into lmp-dev