Merge changes I2ade7f48,I78485a16 into ub-launcher3-master

* changes:
  2/ Move device state logic to its own class
  1/ Renaming some classes for clarity