Merge "Prevent back button from being handled by app after waking device" into nyc-mr1-dev