Merge "Fix priv-app edge case across OTAs" into klp-dev