Merge "Clean FooterPreferenceMixin and FooterPreferenceMixinCompat"