Merge branch 'origin/stable' into dev

70bd2661 resolves the current tst_controls failure which is blocking
qtdeclarative#dev integration. We cannot merge the latest origin/stable
yet, because that depends on the next qtdeclarative stable->dev merge.

Change-Id: I170aec576a06bc79e2df9564e8cf77a0044bd3aa