DO NOT MERGE Fix bug where folder was almost transparent

Bug: 8775089

Change-Id: I55d1bdf687e40017a10561f6bb20fc8920ab123c