Merge "DO NOT MERGE fix runstate race condition" into gingerbread