Merge "fallout of splitting libsensor out of libgui"