Merge "Revert "Add property for apps to request support for showing multi-instance entry points"" into main