Merge "Fix connected devices settings jank issue" into sc-dev