Merge "Make sure project is indexed after creation" into stable-3.4