Merge "Force an initial event to be sent to ProximitySensor." into sc-dev