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

Change-Id: Ic76013e56887dbd8d26b52623f792753e9302d85