Merge "Change database sync timeout from 300 to 900 in low-memory-usage environment...