Bug 811528 - pref native identity on
Bug 826177 - Vibrate every 2 secs as long as a call is waiting.
r=alive
Merge pull request #7289 from etiennesegonzac/bug-826177-call-waiting-notification

Bug 826177 - Vibrate every 2 secs as long as a call is waiting.
Bug 826354 - Don't show cards view when screen is locked
Merge pull request #7291 from ttaubert/cardsview/bug-826354-dont-show-when-locked

Bug 826354 - Don't show cards view when screen is locked
Bug 826366 - Remove on call cpu wakelock if the screen is not turned off by proximity event
Merge pull request #7290 from timdream/scm/remove-cpulock-when-manual-off

Bug 826366 - Remove on call cpu wakelock if the screen is not turned off by proximity event, r=etienne, a=blocking-basecamp
Merge pull request #6845 from jedp/811528-pref-identity-on

Bug 811528 - pref native identity on; r=ferjm
Bug 823370 - [FTU] Hit Import SIM contacts multiple time will create duplicate contacts