Merge "Honor per-user setting for assist gesture and long-press home" into sc-dev