Merge "UI and error message fixes for 16k developer option" into main