Bug 2245 - Fixed critical issues

 - Array is stored directly
 - Wait not in loop
 - Naked notify

Change-Id: Ifa9f431b84298d724351c89e8c330a69b8ab1ff3
Signed-off-by: Michal Polkorab <michal.polkorab@pantheon.sk>