Merge "Clean up modelView matrix logic"