Merge "Begin disconnecting KeyguardStatusViewController from NPVC" into udc-qpr-dev