Merge "Replace current activity fragment with highlight"