Merge "Fix restore orientation for nosensor in folded state" into main