Merge "Added null check to fileobserver callback"