Merge "Fix potential NPE when saving fragment state."
tree: 26c14cee8b8be95157e5c2e6da3113d88d34c278
  1. v13/
  2. v4/