Merge "DMS: check cached mode for user apps only" into main