Merge "Don't apply fancy back logic when drawer is not present." into nyc-dev