Merge "Updating strings for 16KB developer option" into main