Merge "Temporary fix to prevent TEMPORARILY_NOT_METERED leak" into rvc-qpr-dev