Merge changes I674abfcc,Ia40f4c53 into honeycomb-mr1

* changes:
  When the user touches a peeked notification, reset the fadeout timer.
  Fix touches on glowing region around panel.