Navigation camera - conflict resolution

Hi Ravi, here's a pull request with all of master's changes, plus a conflict resolution for viewerDynamicObjectMixin.