Merge changes from topic 'am-2f7a5b3d426742748bd60ca695e3c03a'

* changes:
  Merge changes I37c8daa6,I5a05b65d,If56347fd am: 9309f1cbf3 am: b4248148da am: f9e5488bd1 am: 6edb9856f7
  Preload2: Add isSingleThreaded am: 3bf65c916c am: 57c14c8ee6 am: 80ae2ed225 am: 190dbbd0af
  Preload2: Fix action inheritance am: 1c809a3d32 am: 24cd3418c7 am: 2b34ac2bd6 am: 26c94b7430
  Preload2: Abstract out UI am: 5cb8998363 am: 826ec71e96 am: eab0eadbf6 am: af5b2c3010