Merge "DO NOT MERGE - Fix demo mode reset notification" into nyc-mr2-dev