Merge "Add null pointer check for mConfig in onSessionLost"