Merge "Adding API for apps to specify their aspect ratio when entering PIP."