Merge "drop distractionOptimized flag from MDTHellpActivity" into qt-dev
am: 1cd8417ce9

Change-Id: I49fc4924f6d76c8d1c455e19463bd113fa48a8cb