Refs #10367 mobile optimization