am 06ad3f19: Merge "Offer a masked version of setUiOptions for windows to only modify certain flags."

* commit '06ad3f19f5352efafced33058356a29caa7c5403':
  Offer a masked version of setUiOptions for windows to only modify certain flags.