Merge "Fix bug 6065890 - Correct callback sequence for action bar tab switching"