Bug 924736 - [Dialer] Incoming call lock screen icons css/animation fine-tune
Revert "Merge pull request #13115 from RudyLu/keyboard/Bug928281-keyboard_OOP"

  This reverts commit 9c6586d85d4340600ace0aa69f5741c5f3f67970, reversing
  changes made to 0c52c04fa2e07c119f4777f1dddc1081734de4ab.

Revert "Bug 912010 - [Keyboard][V1.2] Default Keyboard when all keyboards are de-selected - r=rlu r=garychen r=arthurcc"

  This reverts commit ad0bf992cd379a32de18b9a4bb765757db8af986.

  Conflicts:
	apps/settings/index.html
Merge pull request #12924 from steveck-chung/incoming-call-refinement

Bug 924736 - [Dialer] Incoming call lock screen icons css/animation fine -tune. r=etiennesegonzac, a=timdream.
Bug 915584 - [Bluetooth][Contacts] Receiving a contact via bluetooth when the device does not have SD Card flow differs from the expected