Merge "Revert change to force_dark property" into qt-dev
am: a88da2b7c7

Change-Id: I49fd9dc456e21f1f3399e0c5a3c68d97cec15e74