Merge "Make rssi state change sticky" into jb-mr1-dev