Add loading notification message
Merge branch 'prototype/save-state'