Merge "Make the systemui process persistent." into gingerbread