Merge "Do not ignore locked orientation by universal resizable" into main