Merge "Update for ActionBar API change"