Merge "Refactor usages of Picture In Picture and Multi Window (1/4)" into nyc-dev