Dismiss color fade when it is no longer used.

Previously the color fade layers would stay active until the screen was turned
back on. After this change, the layers are dismissed as soon as color fade
completes.

Bug: 24276564

Change-Id: I1f81b397d82d518c2bc921b22f7fe9fd066fc059