CMFM: Fix move infinite loop

Change-Id: I5a4f3ae0844506a08819d355b840637b5374f0f2
JIRA: CYAN-2791
Issue: https://jira.cyanogenmod.org/browse/CYAN-2791
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0