Merge "Split app and non app window code" into main