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