Merge "Add support for keeping fixed orientation of non-top visible app" into main