Merge "Fix hidden subtitle issue"