am 7fdd3431: am 873f9b90: am 6435c800: Merge "Fix an issue on the transition between the setup and the settings"
* commit '7fdd34317d863db6516a28126b70d2f9c74d7da0':main
commit
fbe55eae94
* commit '7fdd34317d863db6516a28126b70d2f9c74d7da0':main