Merge "fix the NPE problem when the  button_bar_container layout is not config." into main