Merge "Use wear style dialog for ICC hotswap restart dialog." into cw-e-dev