Merge "Revert "Revert "Disable R8 for Settings"""