Merge "Add nullability annotation for  VISS#onShow()"