Merge "Avoid NPE when accessing to EnforcedAdmin" into qt-dev