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

Change-Id: I37312a0a6daff0d7dac8d9c4e656a9a4d87b00db