Thanks, Henry. SHINDIG-1627 seems to be the right issue for the feature Dan or I plan to work on when we find time.
Ryan, I just would like to fix the issue before the other patch is available so we can have some buffer to wait for the the other patch ( it may take some time to do that ). Also this patch includes other UI updates... Sure I will attach this to an JIRA issue. thanks, li