Bug 1021481 - Handle app protocol for DEBUG=1 mode, with port change
Merge pull request #21024 from shamenchens/Bug1021481-App-Protocol-5

Bug1021481 Handle app protocol for DEBUG=1 mode, r=yurenju