Merge "Fix bug 2838426 - timing issue with starting/finishing action bar context modes"