am 4326da7e: Merge "DO NOT MERGE Fix back button state issue" into ics-scoop

* commit '4326da7e0d5d63bad718e9848294405971f8f9ab':
  DO NOT MERGE Fix back button state issue