Add editing and preview messages to header area

Some cleanup from rebase hell

Change-Id: I366e798a2101d873fabbe768721dbcc1f5b7ba6b
Merge "Add editing and preview messages to header area"