Refactor usages of Picture In Picture and Multi Window (2/4)

Bug: 27365860
Change-Id: Ic334ffc90a8610803975ab765e1016f2827a3c54
6 files changed