Merge "Fallback added for HEAVY_CLICK effect" into pi-dev