Merge "Use display cutout info in auto-enter-pip transition" into sc-dev