Merge "Check for null to fix NPEs when fragment is shutting down." into lmp-mr1-dev