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

Change-Id: Id03eefaa6d5747e6aacc5e4bc19c9f17d43a0613