Merge "Fixed connectivity state in some power saving scenarios." into nyc-dev