Merge "Offset display cutous on foldables" into main