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

Change-Id: I8be1ffa0996eae0918064b32b261c75bcbd26472