Merge "Allow setActionBar() to take a null param"