Merge change 8605

* changes:
  Encourage the better way of removing an Activity's title bar.