Merge "Persist metric activation across beta4/5 ota" into qt-dev