Merge "Make all editor rows 54 dp"