Merge "Fix switchbar margin" into nyc-dev