Merge "Separate layout ops from surface ops."