Merge "Increase meminfo dumpsys timeout" into sc-dev