Merge "Fix tabindex applied twice on RC top section"