Merge "Use updatable sysprop to for enabling APEX mgmt" into qt-dev