Fix bug where Folder name stayed invisible. am: 19db4255a6 am: bee75ded54

Change-Id: I15eb3633be13158df2d0dac5189cbc86969aaf14