Merge \"Prevent back button from being handled by app after waking device\" into nyc-mr1-dev
am: 1b7c5631c4

Change-Id: I0a0dae375e9528040483e4471d3093679a94533c