Merge "Retain signal level even when data is offline." into ics-factoryrom