Merge "[GarageModeTestApp] Small UI improvements"