Bug 828219 - Add delay to geolocation prompt and use watchPosition to avoid multiple prompts
Merge pull request #7432 from daleharvey/camera-watchposition

Bug 828219 - Add delay to geolocation prompt and use watchPosition to av...
Bug 828984 - [Dialer] Edit mode transitions should be unified to 0.3s.
Merge pull request #7507 from gtorodelvalle/dialer-bug-828984-transitions-to-0.3s

Bug 828984 - [Dialer] Edit mode transitions should be unified to 0.3s.
Auto-merge from branch 'master'