Merge "Add option to exclude overlay to getTopNonFinishingActivity" into main