Merge "gcdb: display: fix panel simulation issue"