Merge "Show pip until drawn with entering bounds if rotation changes" into main