Merge "Update assist handle behavior control" into qt-dev
am: f8e7608263

Change-Id: I8fe5c7a89c0773de83329fac26d10d8a4215eae6