Merge "Make ActionBar menus handle configuration changes gracefully."