Merge "correct one logic error in decide whether should render or not"