Merge "Update style switchbar layout"