Merge commit '454e3c848feee705df79ea02feca5c9b97bfc5de' * commit '454e3c848feee705df79ea02feca5c9b97bfc5de': Fix NPE when provider returns null cursor.