Merge "Changed intents for data and saver tiles" into qt-dev
am: 3d6d6f0085

Change-Id: I671d7edc1366c53d4ab002a38c2306dd31cf4260