Merge "Clean up updatedmarker styling mess"