Merge "Keyguard migration, add aconfig flag for bottom area refactor" into main