Merge "Enable a11y actions on lock icon in non-udfps devices" into main