Merge "Add new dialog for warning confirmations" into cw-e-dev