Merge "Fix a bug with closing action bar context modes"