Merge "Do not apply transparent policy if orientation is respected" into main