Merge "fix picture-in-picture logging"