Ensure edit form doesn't clear the right floated meta

Change-Id: Ieb595e70013948f78473c5682822d43bdfa3d327