am 90672aa0: Fix preference copy migration and incorrect HDR+ sticky bit

* commit '90672aa08379e598426c12b529a86afd4b61011e':
  Fix preference copy migration and incorrect HDR+ sticky bit