Completing fix for issue 5052078, folder items no longer lost

Change-Id: I9d9cc4658122816e2a60de2e12da65f3fe42bc5c
3 files changed