Merge "Add clear option to resize PiP"