Merge "Revert "Ensure that only SysUI can override pending intent launch flags"" into qt-dev