Merge "Remove redundant Nullable annotation for  applyDisplayChangeIfNeeded method." into main