Merge "Revert "Adjust smallestScreenWidthDp for letterbox"" into tm-qpr-dev