Merge "Update windowing mode with acitivity option in freeform mode" into main