Merge "Fix bug 5279075 - Handle action bar config changes when action mode is active"