Merge "Add push-button sample for dashboard" into devel/master