Merge "Set capture size independent of nav tab size"