Merge "[Catalyst] Initial integration for Android version screen" into main