Merge "Remove deprecated and unused ActionButton" into devel/master