Bug 1007600 - Support inline activity
Merge pull request #24925 from crh0716/1007600

Bug 1007600 - Support inline activity r=eragonj, alive