Merge "Fix: Cache key should include Layout type" into udc-dev