Merge "Fix NPE while installing multiple Payment Apps"