Merge "Simplify logic for disconnect and getConnectionStatus in MapProfile"