Merge "[MS42.1] Replace PhoneStateListener with DisplayInfoListener"