am 85fb88ee: Merge "HTML injection fix for bluetooth pairing, issue 65946"

* commit '85fb88ee10c6bb901d30e50038b4a86252ff8c68':
  HTML injection fix for bluetooth pairing, issue 65946