Merge \\"Fix bug where swiping on the fp sensor when the screen is off causes...
Merge \\"Fix bug where swiping on the fp sensor when the screen is off causes blank screen\\" into nyc-mr1-dev am: 538b836e
am: ba350f35
Change-Id: Ia83a8afd2d55f53b90b17307e3214ee581de9ca6