LPS-28233 Improve usability of mobile device rule creation to avoid extra button click