Updated Message handling of dashboard preview operations for GCP-6666 & GCP-6651
Part 2 of message handling updates on preview ops