Merge changes I2d09a84e,I111aab35 into pi-dev

* changes:
  Do not show bouncer when fading away
  KeyguardBouncer#isShowing fix