Merge "Rename layoutLetterbox() following existing conventions" into main