Merge "Add tile information to ACTION_QS_TILE_PREFERENCES intent"