Merge "Restore decorFitsSystemWindows from preserved window" into main