Merge "Protect sensitive content in multi/split window use case" into main