Merge "Make FalsingManager send out an event when second tap is required." into sc-dev