Merge "Keep device state always updated" into jb-mr2-dev