Fix issue where back button causes shade to appear over bouncer.

This ensures that when the back button is pressed, we close the bouncer
and go back to the dream.

Fixed: 228616235
Test: locally on device
Change-Id: I9ac089c889ded6065e308d15b52c73c45c200170