Merge "ART: Use try-lock for interface marking" into pi-dev