Merge "Adds a flag to force the Nav Bar handle to remain visible"