Merge "Fix NPE in QuickContactActivity" into lmp-dev