Bug 921404 - [Flatfish][Lockscreen] screen clock is too small on tablet
fix Bug 921404 uplift
Merge pull request #12758 from fcampo/retryCount-905173

Bug 905173 - PIN code screen should not display '3 tries left.' when loading (r=Rik)(cherry picked from commit 43091d1a13e4bbb2693f5238c80307fca36e2175)

Conflicts:
	shared/test/unit/mocks/mock_icc_helper.js
Bug 922582 - Remove the caller number when entering switch-calls mode r=etienne