EMM-671: Fix my Apps issue