Merge "Allow overlaying default activity recognizer" into sc-dev