Merge changes Id3254a13,Id84a4b94 into main

* changes:
  Fix aspect ratio for transparent letterboxed activity
  Fix aspect ratio for letterboxed activity in `LetterboxAppHelper`