Merge "Fix some demo mode issues" into mnc-dev