tree ad9d692e3bdbd9854164e7534b9935dcbda69a51
parent 965e46b2ba086625c54aa70de1d853083081e7b0
author Mady Mellor <madym@google.com> 1516733519 -0800
committer Mady Mellor <madym@google.com> 1516734080 -0800

Shouldn’t null out grid content when resetting view

Also reset the view when we should

Test: manual - switch between two grid templates (weather, 
      gallery, contact)
Change-Id: If84e565f59ad0a37e4579e08bfd71ccff792893c