Merge "Avoid crash in system server when mounting container"