Merge "Chooser fragments shouldn't save instance state." into tm-qpr-dev