Merge "Earlier processing of DrmInfo notification"