Merge "Enable count-based expiration for media metrics" into qt-dev