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

Change-Id: Ic6e818a15976a12ccd5e9c465816c07ec237fdd0