Final normalisation of WAP detection

If a browser claims HTML support - it gets HTML, period.

Change-Id: I0abc7aba57bd333609da1fb2c302b6dd60dcb2fb
Merge "Final normalisation of WAP detection"