Merge "Move aspect ratio state into PipBoundsState"