Fix onPageShown and onPageHidden invoke calls.
Merge branch 'hotfix/Fix_OnPageShown_and_OnPageHidden_not_being_invoked'