Merge "Gateway whitelist AdvancedConnectedDeviceDashboardFragment"