Merge "Ignore letterbox in two tests"