Merge change 26235 into eclair

* changes:
  Check for a valid token before adding the fake title bar.