Commit c20a2912 authored Apr 25, 2023 by Jilin Zheng

Merge branch 'master' into 'v1.0_initial_setup_all_screens'

# Conflicts:
#   local.properties

There are no changes