Merge "Correct ActivityInfo constructors."