Merge "SysUIShared wrapper for jank instrumentation"