Merge "Fix NPE when activity launch options are created before taskbaer init" into main