Merge "MTP: Fix NPE in MtpPropertyGroup"