Merge "Restore app pinning." into qt-qpr1-dev
am: 599634a26b

Change-Id: I808d010ea658badb7aaecc4a62074a18ae97f7d0