Merge "Accessibility updates for UDFPS device entry" into main