Merge "Fix Accessbility bugs for PS." into main