Merge "Add API for expanded picture-in-picture"