Merge "Hide grid selection if grid option size <= 1" into tm-dev