merging force-ui-detail offline bug fix from master