Cleanup State Handling in PageViewFragment

Change-Id: I841a90f733151c143751f886b93ccd3c0750e932