Merge changes Ib856123e,I2baf3541 into main

* changes:
  Fix flaky motion tests
  Adding logs to identify any abnormal updates to the padding of the device entry icon