Merge "SENSING_TIMEOUT goes to STATE_INACTIVE. Bug: 27821977" into nyc-dev