Merge "Allow display letterbox if starting or base application" into main