Put long press to toggle PW back

jeff has plans to enhance this. So this can be merged for the
time being.

Change-Id: I75a7b0b4ed6b6c45cddeb6cf8fe4bc8d4aa6b2c2