Merge "Revert "Decouple systemui shared componements from PipController...""