Merge "Make the PipManager remember custom aspect ratios"