Merge "Fix test case fail in ConnectedDeviceDashboardFragmentTest" into sc-dev