Merge change I2c5f1e76 into eclair

* changes:
  Fix back button handling in ACTV