Merge "Fix code formatting according to ktfmt rules"