Merge "Add intent flags back to TaskInfo's base intent" into rvc-dev