Switching overlays more correctly

Test: presubmit
Bug: 180114721
Change-Id: I0d8d0c70ef34ec941e28704d06f9df5f17782155
1 file changed