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

Change-Id: I367456961363134903b4df8ccbaa00f92f36e290