Merge "Cleanup mw ui checkbox margins"