Merge changes from topic "revert_ui_mode_changes" into rvc-qpr-dev am: a18b9f3e42 am: 42e3618151

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/12932788

Change-Id: I331c8b67d6ffe66670cd37f6670ad473e65feac6