Merge "Refactor Skin::buildSidebar() code style"