Merge "Allow themeing of icon in SuspendedAppActivity" into qt-dev