Merge "Only call per-user calls for gesture settings observer" into tm-qpr-dev