Merge "Make safeWaitForMasterPos() use mWaitTimeout instead of hard-coded value"