Merge "Don't verify display size for foldables temporarily" into tm-dev