Merge "Prevent recent and right navbar icon overlap"