Merge "Made sure smart actions now launch also inline same as activity launches" into qt-dev
am: 899e3ee0dc

Change-Id: I1f7bea78e1a2b7f78dafa1ef150e1ce072fd64a0