Merge "DPMS: fixes calls to getMainUser()"