Merge "Fix wifi disable during restore" into mnc-dev