Merge "InputReader: Bump generation when associated display changes" into main