Merge "Disable clicks on buttons without actions" into pi-dev