Merge "Fix demo mode issues" into mnc-dev