Merge "Fix title bar bug"