Merge "Fix bug #15115542 Ripple effect is crashing Settings with java.lang.NullPointerException"