Merge "Using bundle instead of a custom class for SaveInstanceState"