Merge "Extend activity options pending intent flags to support multiple task" into main