# Conflicts: # lawnchair/src/app/lawnchair/preferences2/PreferenceManager2.kt # quickstep/src/com/android/quickstep/SystemUiProxy.kt
# Conflicts: # lawnchair/src/app/lawnchair/preferences2/PreferenceManager2.kt # quickstep/src/com/android/quickstep/SystemUiProxy.kt