Merge "Fix "Clear all" tap ripple is cut off" into pi-dev