Merge "Remove onBeforePop() logic so back no longer opens/closes drawer." into nyc-andromeda-dev