Merge "Added time waited when app helper fails to find app in foreground." am: f5c18c8d am: 337add50 am: d2bcfdf7 Change-Id: I8ae48d89b417ebdcaafdf304dcbb1590393cee66