Merge "Allow extras to be passed to app info subscreens"