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