Merge "Persist active metric status across system server" into qt-dev