Merge "Add FSI view binder and wm config" into tm-qpr-dev