Merge "Fix NPE in handleBindApplication"