Merge "Make readonly work for OOUI forms"