Merge "Fix a bug where the lazy-initialized ActionBar object was being too lazy."