Merge "Add API surface for "keep SMS app running"."