Merge "Update SysUI to be compatible with latest Jetpack libraries" into tm-dev