Merge "Remove unused enumeration types of ButtonAction" into devel/master