Merge "Clear out any existing buttons before adding the set of requested actions." into jb-dev