merge in KQS81M
fix race condition in photo dreams settings activity

Bug: 11225307
Change-Id: I7e52c83e172aa2e1418344fc14d438644d54dd07
merge in klp-release (no-op)
am 17bd2d15: fix race condition in photo dreams settings activity

* commit '17bd2d15dd9630dabf8defb353fdda8ba379f528':
  fix race condition in photo dreams settings activity
Merge tag 'android-4.4.1_r1' into HEAD

Android 4.4.1 Release 1