Merge "Fix sensor demo when there are no sensors" into main