Merge "Moved alert setup code to onCreate"