Merge "(bug 40306) Only convert align to float for table."