Merge change 26657 into eclair

* changes:
  Fix title bar in album browser.