Merge "Actually wait for installd" into mnc-dev