Mode transition fixes for commit/protect=>show in single page demo