Merge "Fix some force_dark prop behaviors" into qt-dev
am: 8538ceba82

Change-Id: I8a977b15773a9d022a4f3dd59d1d2a607e5e624a