Merge "Fix GridOptionsManager isAvailable NullPointerException" into tm-dev