Merge "Move logcat_longer_timeout to the "stability" namespace" into main