Merge "Use new app header in more screens."