* commit 'b1c7f7f538e8c4947f75406cc6089f6680f59a31': Fix NPE when ripples are canceled due to visibility change