Merge "Fix navbar accessibility button dialog being occluded by the navbar" into main