Merge "Add Recommend preview resolution for bug TZSP-5301"