Temporary work around for loop FC with pie and tiles off

Change-Id: Ia4f1d505ad14e739340d62391ae18190226c12fa
Pie Toggle (1/2)

Change-Id: Idba63a105a2983e311a4ee31d2f0d02e388395db