Merge "drop distractionOptimized flag from MDTHellpActivity" into qt-dev