In this PR: - fixing a regression introduced in a recent PR (#9735) - fixing a typing issue in ViewPicker @ehconitin FYI