Merge "Discontinue comment visibility strategy for new change screen" into stable-2.9