Merge "Fix 3298889: Show continue button on PIN and password screens" into honeycomb