Always trigger layout instead of trying to skip it based on item changes

Always trigger layout instead of trying to skip it based on item changes #450