am 195ba504: Merge "Clear out any existing buttons before adding the set of...
am 195ba504: Merge "Clear out any existing buttons before adding the set of requested actions." into jb-dev
* commit '195ba504':
Clear out any existing buttons before adding the set of requested actions.