[FXOS-160] Move apps back to homescreen when removing:

 1. The folder that contains the app
 2. The app from the folder

 and the app is not in any other folder or the homescreen