Merge "Fixes issues with Sensors in KitchenSinkApp"