Merge "Unregister prox sensor when QS or Bouncer are expanded."