Merge "Use fragment context in AppHeaderController"