Merge "Add KEY_ENABLE_WHEN_COMPLETED for testing" into qt-dev
am: f68b125ade

Change-Id: I6cee290ace11be340f69d367d70fa75a688e28df